xend: fix "xm list hangs"

If a command hold domains_lock, "xm list" would hang for waiting for
the lock. Such as creating many VMs at a script (such as 20), command
of "xm list" could hang for long time(10 mins).  I think domains_lock
here only protect update().  So, we shouldn't do update before command
of "list" really get this lock, but xm do need show the domain's
information quickly. In this patch, if command couldn't get the
domains_lock after 20 times trying, "xm list" would show the
information of VMs without update().

Signed-off-by: James Song (Wei) <jsong@novell.com>

diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py
index 888c2a7d6fcc8f9d10c66dd921b692a1df9d7b16..73fee7077b12a55e69e58beefe2d27b98204b922 100644 (file)
--- a/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@ -824,10 +824,16 @@ class XendDomain:
         if type(state) == int:
             state = POWER_STATE_NAMES[state]
         state = state.lower()
-        
-        self.domains_lock.acquire()
+        resu = False
+        count = 0
+        while True:
+            resu = self.domains_lock.acquire(0)
+            if resu or count < 20:
+                break
+            count += 1
         try:
-            self._refresh(refresh_shutdown = False)
+            if resu:
+                self._refresh(refresh_shutdown = False)
             
             # active domains
             active_domains = self.domains.values()
@@ -846,7 +852,8 @@ class XendDomain:
                                   POWER_STATE_NAMES[x._stateGet()].lower() == state,
                               active_domains + inactive_domains)
         finally:
-            self.domains_lock.release()
+            if resu:
+                self.domains_lock.release()
 
 
     def list_sorted(self, state = DOM_STATE_RUNNING):